From fc4898e6e2d493e9c686f19c4b46be722e1907c8 Mon Sep 17 00:00:00 2001
From: robertl <robertl>
Date: Sun, 21 Feb 2010 04:40:37 +0000
Subject: [PATCH] Write description in waypoints in KML writer.

---
 kml.c                         |  5 ++++-
 reference/earth-expertgps.kml | 36 +++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/kml.c b/kml.c
index c35a36756..3760a993d 100644
--- a/kml.c
+++ b/kml.c
@@ -1011,7 +1011,10 @@ static void kml_waypt_pr(const waypoint *waypointp)
 
 		kml_write_xml(0, "</description>\n");
 		xfree(odesc);
-	}
+	} else {
+	  if (strcmp(waypointp->shortname, waypointp->description))
+	    kml_write_xmle("description", waypointp->description);
+        }
 
 	// Timestamp
 	kml_output_timestamp(waypointp);
diff --git a/reference/earth-expertgps.kml b/reference/earth-expertgps.kml
index fad110ca9..6f4a0241b 100644
--- a/reference/earth-expertgps.kml
+++ b/reference/earth-expertgps.kml
@@ -250,6 +250,7 @@
       </Placemark>
       <Placemark>
         <name>6006</name>
+        <description>600698</description>
         <TimeStamp><when>2001-06-02T03:26:55Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -498,6 +499,7 @@
       </Placemark>
       <Placemark>
         <name>BEAR HILL</name>
+        <description>BEAR HILL TOWER</description>
         <TimeStamp><when>2001-06-02T03:27:03Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -514,6 +516,7 @@
       </Placemark>
       <Placemark>
         <name>6016</name>
+        <description>Bike Loop Connector</description>
         <TimeStamp><when>2001-11-28T21:05:28Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -522,6 +525,7 @@
       </Placemark>
       <Placemark>
         <name>5236BRIDGE</name>
+        <description>Bridge</description>
         <TimeStamp><when>2001-06-02T03:26:59Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -530,6 +534,7 @@
       </Placemark>
       <Placemark>
         <name>5376BRIDGE</name>
+        <description>Bridge</description>
         <TimeStamp><when>2001-06-02T03:27:01Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -538,6 +543,7 @@
       </Placemark>
       <Placemark>
         <name>6181CROSS</name>
+        <description>Crossing</description>
         <TimeStamp><when>2001-06-02T03:27:05Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -546,6 +552,7 @@
       </Placemark>
       <Placemark>
         <name>6042CROSS</name>
+        <description>Crossing</description>
         <TimeStamp><when>2001-06-02T03:27:05Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -554,6 +561,7 @@
       </Placemark>
       <Placemark>
         <name>DARKHOLLPO</name>
+        <description>Dark Hollow Pond</description>
         <styleUrl>#waypoint</styleUrl>
         <Point>
           <coordinates>-71.103646,42.458516,0.000000</coordinates>
@@ -561,6 +569,7 @@
       </Placemark>
       <Placemark>
         <name>6121DEAD</name>
+        <description>Dead End</description>
         <TimeStamp><when>2001-06-02T03:26:57Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -569,6 +578,7 @@
       </Placemark>
       <Placemark>
         <name>5179DEAD</name>
+        <description>Dead End</description>
         <TimeStamp><when>2001-06-02T03:26:59Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -577,6 +587,7 @@
       </Placemark>
       <Placemark>
         <name>5299DEAD</name>
+        <description>Dead End</description>
         <TimeStamp><when>2001-06-02T03:27:01Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -585,6 +596,7 @@
       </Placemark>
       <Placemark>
         <name>5376DEAD</name>
+        <description>Dead End</description>
         <TimeStamp><when>2001-06-02T03:27:02Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -593,6 +605,7 @@
       </Placemark>
       <Placemark>
         <name>6353DEAD</name>
+        <description>Dead End</description>
         <TimeStamp><when>2001-06-02T03:27:03Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -601,6 +614,7 @@
       </Placemark>
       <Placemark>
         <name>6155DEAD</name>
+        <description>Dead End</description>
         <TimeStamp><when>2001-06-02T03:27:04Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -609,6 +623,7 @@
       </Placemark>
       <Placemark>
         <name>GATE14</name>
+        <description>Gate 14</description>
         <TimeStamp><when>2001-06-02T03:26:59Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -617,6 +632,7 @@
       </Placemark>
       <Placemark>
         <name>GATE16</name>
+        <description>Gate 16</description>
         <TimeStamp><when>2001-06-02T03:27:00Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -625,6 +641,7 @@
       </Placemark>
       <Placemark>
         <name>GATE17</name>
+        <description>Gate 17</description>
         <TimeStamp><when>2001-06-02T03:27:01Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -633,6 +650,7 @@
       </Placemark>
       <Placemark>
         <name>GATE19</name>
+        <description>Gate 19</description>
         <TimeStamp><when>2001-06-02T03:27:02Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -641,6 +659,7 @@
       </Placemark>
       <Placemark>
         <name>GATE21</name>
+        <description>Gate 21</description>
         <TimeStamp><when>2001-06-02T03:27:03Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -649,6 +668,7 @@
       </Placemark>
       <Placemark>
         <name>GATE24</name>
+        <description>Gate 24</description>
         <TimeStamp><when>2001-06-02T03:27:03Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -657,6 +677,7 @@
       </Placemark>
       <Placemark>
         <name>GATE5</name>
+        <description>Gate 5</description>
         <TimeStamp><when>2001-11-28T21:05:28Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -665,6 +686,7 @@
       </Placemark>
       <Placemark>
         <name>GATE6</name>
+        <description>Gate 6</description>
         <TimeStamp><when>2001-11-07T23:53:41Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -673,6 +695,7 @@
       </Placemark>
       <Placemark>
         <name>6077LOGS</name>
+        <description>Log Crossing</description>
         <TimeStamp><when>2001-06-02T00:18:16Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -681,6 +704,7 @@
       </Placemark>
       <Placemark>
         <name>5148NANEPA</name>
+        <description>Nanepashemet Road Crossing</description>
         <TimeStamp><when>2001-11-07T23:53:41Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -689,6 +713,7 @@
       </Placemark>
       <Placemark>
         <name>5267OBSTAC</name>
+        <description>Obstacle</description>
         <TimeStamp><when>2001-06-02T03:27:00Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -697,6 +722,7 @@
       </Placemark>
       <Placemark>
         <name>PANTHRCAVE</name>
+        <description>Panther Cave</description>
         <TimeStamp><when>2001-11-07T23:53:41Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -705,6 +731,7 @@
       </Placemark>
       <Placemark>
         <name>5252PURPLE</name>
+        <description>Purple Rock Hill</description>
         <TimeStamp><when>2001-11-07T23:53:41Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -713,6 +740,7 @@
       </Placemark>
       <Placemark>
         <name>5287WATER</name>
+        <description>Reservoir</description>
         <TimeStamp><when>2001-06-02T03:27:01Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -721,6 +749,7 @@
       </Placemark>
       <Placemark>
         <name>5239ROAD</name>
+        <description>Road</description>
         <TimeStamp><when>2001-06-02T03:27:00Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -729,6 +758,7 @@
       </Placemark>
       <Placemark>
         <name>5278ROAD</name>
+        <description>Road</description>
         <TimeStamp><when>2001-06-02T03:27:01Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -737,6 +767,7 @@
       </Placemark>
       <Placemark>
         <name>5058ROAD</name>
+        <description>ROAD CROSSING</description>
         <TimeStamp><when>2001-06-02T00:18:14Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -745,6 +776,7 @@
       </Placemark>
       <Placemark>
         <name>SHEEPFOLD</name>
+        <description>Sheepfold Parking Lot</description>
         <TimeStamp><when>2001-06-02T00:18:13Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -753,6 +785,7 @@
       </Placemark>
       <Placemark>
         <name>SOAPBOX</name>
+        <description>Soap Box Derby Track</description>
         <TimeStamp><when>2001-06-02T03:27:04Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -761,6 +794,7 @@
       </Placemark>
       <Placemark>
         <name>5376STREAM</name>
+        <description>Stream Crossing</description>
         <TimeStamp><when>2001-11-07T23:53:41Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -769,6 +803,7 @@
       </Placemark>
       <Placemark>
         <name>5144SUMMIT</name>
+        <description>Summit</description>
         <TimeStamp><when>2001-11-28T21:05:28Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
@@ -777,6 +812,7 @@
       </Placemark>
       <Placemark>
         <name>5150TANK</name>
+        <description>WATER TANK</description>
         <TimeStamp><when>2001-06-02T00:18:16Z</when></TimeStamp>
         <styleUrl>#waypoint</styleUrl>
         <Point>
-- 
2.30.2